-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Properly warn if food will cause you to overeat #74318
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
[C++]
Changes (can be) made in C++. Previously named `Code`
Player Faction Base / Camp
All about the player faction base/camp/site
<Bugfix>
This is a fix for a bug (or closes open issue)
astyled
astyled PR, label is assigned by github actions
json-styled
JSON lint passed, label assigned by github actions
labels
Jun 4, 2024
...I have no idea how that test failure has happened, but it seems like it may be related. Let's roll the dice (re-run the test) anyway! |
Kamejeir
reviewed
Jun 5, 2024
Co-authored-by: Kamejeir <[email protected]>
RenechCDDA
force-pushed
the
overeating_is_bad
branch
from
June 6, 2024 22:31
60472f0
to
cd5fda7
Compare
github-actions
bot
added
astyled
astyled PR, label is assigned by github actions
BasicBuildPassed
This PR builds correctly, label assigned by github actions
and removed
astyled
astyled PR, label is assigned by github actions
labels
Jun 6, 2024
github-actions
bot
added
BasicBuildPassed
This PR builds correctly, label assigned by github actions
and removed
BasicBuildPassed
This PR builds correctly, label assigned by github actions
labels
Jun 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
astyled
astyled PR, label is assigned by github actions
BasicBuildPassed
This PR builds correctly, label assigned by github actions
<Bugfix>
This is a fix for a bug (or closes open issue)
[C++]
Changes (can be) made in C++. Previously named `Code`
json-styled
JSON lint passed, label assigned by github actions
Player Faction Base / Camp
All about the player faction base/camp/site
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Bugfixes "Properly warn if food will cause you to overeat"
Purpose of change
Same reason as #74149, make camp meals not stuff your face without warning
Character::will_eat and Character::update_stomach had different ideas about when the stomach was full
Describe the solution
Take them out to a nice foodplace™ dinner so they can sort out their differences (new function, both of them use it. one source of truth)
Also updated the camp menu while I was here so you can choose how you stuff your piehole. Please eat responsibly, even ingame.
Describe alternatives you've considered
units::volume in_stomach_volume = food.volume() * compute_effective_food_volume_ratio( food );
I bet there's other places that should be using this, I just haven't found them yet
Testing
(After first commit, before second commit):
https://github.com/CleverRaven/Cataclysm-DDA/assets/84619419/92ada55c-5231-47ab-bbf1-4cc265617d18
Additional context